# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1108+1.1069.1.105 -> 1.1109 # kernel/sysctl.c 1.19.1.10 -> 1.27 # Makefile 1.190.1.58 -> 1.235 # drivers/net/Makefile 1.29.1.11 -> 1.39 # drivers/net/tg3.c 1.61.2.38 -> 1.71 # drivers/acpi/dispatcher/dsopcode.c 1.17.1.2 -> 1.21 # Documentation/Configure.help 1.162.1.43 -> 1.185 # include/asm-ia64/sal.h 1.7.1.11 -> 1.14 # diff -Nru a/Documentation/Configure.help b/Documentation/Configure.help --- a/Documentation/Configure.help Thu Oct 30 16:23:55 2003 +++ b/Documentation/Configure.help Thu Oct 30 16:23:55 2003 @@ -18345,6 +18345,11 @@ purpose port, say Y here. See . +Support for serial ports defined in ACPI namespace +CONFIG_SERIAL_ACPI + If you wish to enable serial port discovery via the ACPI + namespace, say Y here. If unsure, say N. + Support for PowerMac serial ports CONFIG_MAC_SERIAL If you have Macintosh style serial ports (8 pin mini-DIN), say Y diff -Nru a/Makefile b/Makefile --- a/Makefile Thu Oct 30 16:23:55 2003 +++ b/Makefile Thu Oct 30 16:23:55 2003 @@ -93,6 +93,7 @@ CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ -fno-strict-aliasing -fno-common +CFLAGS += -g ifndef CONFIG_FRAME_POINTER CFLAGS += -fomit-frame-pointer endif @@ -306,8 +307,7 @@ $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in xconfig: symlinks - $(MAKE) -C scripts kconfig.tk - wish -f scripts/kconfig.tk + @echo -e "***\n* Sorry, xconfig is broken; use \"make menuconfig\" instead.\n***" menuconfig: include/linux/version.h symlinks $(MAKE) -C scripts/lxdialog all diff -Nru a/kernel/sysctl.c b/kernel/sysctl.c --- a/kernel/sysctl.c Thu Oct 30 16:23:55 2003 +++ b/kernel/sysctl.c Thu Oct 30 16:23:55 2003 @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -312,6 +313,10 @@ &laptop_mode, sizeof(int), 0644, NULL, &proc_dointvec}, {VM_BLOCK_DUMP, "block_dump", &block_dump, sizeof(int), 0644, NULL, &proc_dointvec}, +#ifdef CONFIG_HUGETLB_PAGE + {VM_HUGETLB_PAGES, "nr_hugepages", &htlbpage_max, sizeof(int), 0644, NULL, + &hugetlb_sysctl_handler}, +#endif {0} };